Auto merge of #1964 - steveklabnik:doc_fix, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 3 Sep 2015 16:28:44 +0000 (16:28 +0000)
committerbors <bors@rust-lang.org>
Thu, 3 Sep 2015 16:28:44 +0000 (16:28 +0000)
This has changed, apparently.


Trivial merge